Skip to content

manifest: update zephyr to bring Bluetooth DIS Kconfig changes #20367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Feb 17, 2025
Merged

manifest: update zephyr to bring Bluetooth DIS Kconfig changes #20367

merged 1 commit into from
Feb 17, 2025

Conversation

@kapi-no
Copy link
Contributor

@kapi-no kapi-no commented Feb 14, 2025

Updated the Zephyr revision in the manifest to bring the Bluetooth Device Information Service (DIS) Kconfig changes that control the behaviour of the Model Number and Manufacturer Name GATT characteristics.

@kapi-no kapi-no requested review from a team as code owners February 14, 2025 08:25
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Feb 14, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 14, 2025 •
edited
Loading

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
zephyr nrfconnect/sdk-zephyr@776b31e nrfconnect/sdk-zephyr@5605c8c (main) nrfconnect/[email protected]

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 14, 2025 •
edited
Loading

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 5

Inputs:

Sources:

sdk-nrf: PR head: 108c56116adacb01e628616c45097006e0457d7e
zephyr: PR head: 5605c8c0d3855bc3f50c7a9b9ccd5c32d99b4779

more details

sdk-nrf:

PR head: 108c56116adacb01e628616c45097006e0457d7e
merge base: 5481bb27a3304cd9d8f22bdf802d6b4902155e5c
target head (main): 5481bb27a3304cd9d8f22bdf802d6b4902155e5c
Diff

zephyr:

PR head: 5605c8c0d3855bc3f50c7a9b9ccd5c32d99b4779
merge base: 776b31e3ebc43993e2e7c2043a2bf1a5beb37815
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (13) 
applications
│  ├── nrf_desktop
│  │  │ Kconfig.ble
samples
│  ├── bluetooth
│  │  ├── central_nfc_pairing
│  │  │  │ prj.conf
│  │  ├── fast_pair
│  │  │  ├── input_device
│  │  │  │  │ prj.conf
│  │  ├── multiple_adv_sets
│  │  │  │ prj.conf
│  │  ├── peripheral_hids_keyboard
│  │  │  │ prj.conf
│  │  ├── peripheral_hids_mouse
│  │  │  ├── prj.conf
│  │  │  │ prj_bt_rpc.conf
│  │  ├── peripheral_nfc_pairing
│  │  │  │ prj.conf
west.yml
zephyr
│  ├── drivers
│  │  ├── bluetooth
│  │  │  ├── hci
│  │  │  │  │ Kconfig.nxp
│  ├── samples
│  │  ├── bluetooth
│  │  │  ├── peripheral_dis
│  │  │  │  │ prj.conf
│  ├── subsys
│  │  ├── bluetooth
│  │  │  ├── services
│  │  │  │  ├── Kconfig.dis
│  │  │  │  │ dis.c

Outputs:

Toolchain

Version:
Build docker image:

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain
  • ◻️ Build twister
  • ◻️ Integration tests
    • ◻️ desktop52_verification
    • ◻️ test_ble_nrf_config
    • ◻️ test-fw-nrfconnect-ble_samples
    • ◻️ test-fw-nrfconnect-chip
    • ◻️ test-fw-nrfconnect-nfc
    • ◻️ test-fw-nrfconnect-rs
    • ◻️ test-fw-nrfconnect-fem
    • ◻️ test-sdk-find-my
    • ◻️ test-sdk-sidewalk
    • ◻️ test-low-level
    • ◻️ test-sdk-dfu
    • ⚠️ test-secdom-samples-public
Disabled integration tests
    • doc-internal
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-boot
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-sdk-audio
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-wifi

Note: This message is automatically posted and updated by the CI

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 14, 2025

You can find the documentation preview for this PR at this link.

Note: This comment is automatically posted by the Documentation Publish GitHub Action.

@kapi-no
Copy link
Contributor Author

kapi-no commented Feb 14, 2025

Rebased to include the fix for the test_ble_nrf_config plan.

@kapi-no
manifest: update zephyr to bring Bluetooth DIS Kconfig changes
108c561 
Updated the Zephyr revision in the manifest to bring the Bluetooth
Device Information Service (DIS) Kconfig changes that control
the behaviour of the Model Number and Manufacturer Name GATT
characteristics.

Signed-off-by: Kamil Piszczek <[email protected]>
@kapi-no
Copy link
Contributor Author

kapi-no commented Feb 17, 2025

Rebase on top of main branch + sdk-zephyr SHA update (the dependent PR from sdk-zephyr is merged)

@NordicBuilder NordicBuilder removed the DNM label Feb 17, 2025
@kapi-no kapi-no removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Feb 17, 2025
@rlubos rlubos merged commit c736168 into nrfconnect:main Feb 17, 2025
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MarekPieta MarekPieta MarekPieta approved these changes

@nordicjm nordicjm nordicjm approved these changes

@maje-emb maje-emb maje-emb approved these changes

Assignees

No one assigned

Labels

manifest manifest-zephyr

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@kapi-no @NordicBuilder @MarekPieta @nordicjm @maje-emb @rlubos